From 6f75ef505d35cea468e8798768242f8594cba737 Mon Sep 17 00:00:00 2001 From: "emellor@ewan" Date: Mon, 3 Oct 2005 16:40:27 +0100 Subject: [PATCH] Cope with missing configuration information inside the configuration method. This allows us to better recover if the store has been deleted. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/server/blkif.py | 6 ++++-- tools/python/xen/xend/server/netif.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) mode change 100755 => 100644 tools/python/xen/xend/server/blkif.py mode change 100755 => 100644 tools/python/xen/xend/server/netif.py diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py old mode 100755 new mode 100644 index bfc559f74f..34bc4278c6 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -69,8 +69,10 @@ class BlkifController(DevController): 'dev', 'type', 'params', 'read-only') - result.append(['dev', dev]) - result.append(['uname', typ + ":" + params]) + if dev: + result.append(['dev', dev]) + if typ and params: + result.append(['uname', typ + ":" + params]) if ro: result.append(['mode', 'r']) else: diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py old mode 100755 new mode 100644 index d195363ba5..6041e5ed46 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -80,11 +80,15 @@ class NetifController(DevController): 'script', 'ip', 'bridge', 'mac') - result.append(['script', - script.replace(xroot.network_script_dir + os.sep, "")]) + if script: + result.append(['script', + script.replace(xroot.network_script_dir + os.sep, + "")]) if ip: result.append(['ip', ip.split(" ")]) - result.append(['bridge', bridge]) - result.append(['mac', mac]) + if bridge: + result.append(['bridge', bridge]) + if mac: + result.append(['mac', mac]) return result -- 2.30.2